Merge branch '1959_cross_compile'