Fix logical conflict between !1466 and !1494

/cc @thboettc @decianm @jkubat @gunther

added cleanup label

mentioned in merge request !1466 (merged)

added RTA label

approved this merge request

merged

mentioned in commit fbec65e5

mentioned in merge request !1505 (closed)

mentioned in merge request Alignment!251 (merged)

mentioned in issue #426 (closed)