Merge branch 'transfer' into 'main'

Merge from Trial

See merge request !7
2 jobs for rm_portal in 32 seconds (queued for 7 seconds)