Merge branch 'release/3.7.3' into develop