Merge some of the develop patches into refresh