Various bug fixes for controller and service
Merge remote-tracking branch 'origin/master'