prepare for switchover

Related git tag:
   imageon 028c8d4ff3a1cc0d4b1e58ea941d0addd3d600ab