z-index bug
Merge branch 'release/12.5.1' into develop