Merge to latest develop, fix merge conflicts