Merge branch 'release/v1.2.1'
Merge tag 'v1.2.1' into develop

Validation fixes release