I think Rafal did something for SDS.  This was merged in from dev, and was not part of refactor.