Needed feature now available in 2.3-M2 pre-release