[DO_NOT_MERGE][TO_STAGE] bug/1081249 and bug/1081441

Catch stage up to master for late breaking bugs