re-implemented fix for task 1337
Merge remote-tracking branch 'elizar/develop' into develop

* elizar/develop:
  re-implemented fix for task 1337