Fix #3046
Merge branch '3046' of /home/git/repositories/harmony/harmony_bundle_rest
Close #3061
Merge branch '3061' of /home/git/repositories/harmony/harmony_bundle_rest