Patch to Merge Development to Master

Applies the changes of commit 83db9af96c0bbbba75409ceb2e58202aae2bf956
by paulhudak