Merge with develop

[jdknives]

Fixes #

Changes:

• Does this change need to mentioned in CHANGELOG.md?
  yes | no

  Requires testing
  yes | no

  Comments about testing , should you have some