Not sure if this should be part of the current PR?