This closes my feature request #474658