Updated Controller:: doc block and ControllerMergeVarsTest::