Cherry pick 1.5 branch onto master