Due for implementation with patch 2.1.