Almost there with merging...
Most stable merge with master/sharif