merge change from devel for release 10.21