Merge remote-tracking branch 'skodak/w03_MDL-31117_m23_grouptodo'