This is now implemented, will be part of 2.2 release