Code must have been removed in a merge. Re-added it
Merge branch 'develop' into release/1.7

* develop:
  Code must have been removed in a merge. Re-added it