merge 40466 40467 40468