A not wrt #36 in 2.3 branch as well