Merge branch '20240701_cleanup' into 'main'

[cleanup] accept FIX_1101_CLEANING_JBM_CALL,...

See merge request !1664