Merge dev
back to main
in advance of release
#1524
Merged
dev
back to main
in advance of release
#1524