Merge "Some fixes for Ia2782d64 (2f60cd2)"