commandController: query, notificationcontroller:get, query
Merge remote-tracking branch 'origin/master'