Merge branch 'main' into dev/mjbvz/mysterious-vulture