Merge branch 'main' into 'REL3'

MERGE Changes from Main to REL3

See merge request !146