merge 36789 36790 thanks