Merge From hotfix_1.16.xx into development

What is your Merge about? #15 (closed)

If this is your first merge, please use the Initialization Template.

For more information please visit our Contributor Onboarding Guide.