Merge "Fixes for e288e4036"