Backport few fixes from Milestone-Autumn