Merge "installer for new block OTA system"