moved handler
Merge branch 'release/1.24'