Previous merge had missed conflicts. Fixed here.
BlockerDown button was calling the wrong command. Fixed it here.