manually duplicating #629
Merge branch 'master' into develop

* master:
  manually duplicating #629