Main dev sync 1

see changelog for status of this commit