Merge "Fixes for bugs: 6104423, 6103563, 6103509, 6103807 & 6103253."