Merge branch 'release/1.2.4' into develop
More extra fields support
Bump
Merge