align imagemosaic to the new master branch
align imagemosaic to the new master branch