#2976 merged into master-2.3