Hotfix/1100

Fixes #1100
Updated pull to remove merge conflicts of #1125
Added Sunny's changes