Merged Hotfix with new changes