Roadmap item #935