merge jos into update-1