Adding some currently unused changes that may be used in the future
Merge branch 'original/dev' into myFork/master

* original/dev:
  Adding some currently unused changes that may be used in the future