Fix #2619
Merge branch '2619' of /home/git/repositories/harmony/harmony_bundle_rest
Fix #2530
Merge branch '2530' of /home/git/repositories/harmony/harmony_bundle_rest