IDEA-111711 (feature dropped)