Merge remote-tracking branch 'origin/master'
add test command
Upgrade cloak
Merge remote-tracking branch 'origin/test_command'
Merge remote-tracking branch 'origin/upgrade_cloak'