Merge release-7 patch back into develop