Upgrade cloak
Merge remote-tracking branch 'origin/upgrade_cloak'