resolving variable saving on rotate and re-create
Merge remote-tracking branch 'origin/master'