merge changes from devel for release 56.15