Port fixes from vanilla

various fixes from Vanilla

Merge request reports

Loading