merge #11696