Further development towards ATR-20700 This MR replaces !38707 (closed) @bossio @valente @khoo @tamartin @peter