inion merge allUpdate and master