Merge branch 'main' into basop-2620-dead-always-overwritten-clamp-on-log-domain-gsMapping