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