Fix #4030
Merge branch '4030' of /home/git/repositories/harmony/harmony_bundle_rest
Fix #4030
Merge branch 'master' of ssh://git.tactfactory.com:2222/harmony/harmony_bundle_rest into 4030
Merge branch '4030' of /home/git/repositories/harmony/harmony_bundle_rest
Fix #4084
Merge branch '4084' of /home/git/repositories/harmony/harmony_bundle_rest
Fix #4092
Merge branch '4092' of /home/git/repositories/harmony/harmony_bundle_rest