stable: compat fixes for 6.5rc0

Merged Anton Shestakov requested to merge topic/stable/compat-fixes into branch/stable

Merge request reports