Merged changes from @mms-gianni