Merge master to devel for release 56.16 (release tag)