Merge branch 'release/3.10.0' into develop
Making builder version less restrictive
Merge branch 'develop'