MDL-22054 fixed long standing issues with management of modules and blocks - we shoul...