bug in build
Merge branch 'release/12.4.1' into develop