Pull request has been made. However, as the story itself is currently blocked it was decided that merging this change would not be necessary for the moment.