reverse merge to main from 1.2#37

babourine wants to merge 2 commits intomainpatterninc/heimdall:mainfrom

release/1.2patterninc/heimdall:release/1.2Copy head branch name to clipboard