Merging 2 fixes from Master