Fixed mistakes introduced in previous merge
Fixed mistakes introduced in previous merge

CommandPost/CommandPost-App,CommandPost/CommandPost-App,CommandPost/CommandPost-App,CommandPost/CommandPost-App,CommandPost/CommandPost-App,CommandPost/CommandPost-App