Revert "Revert "SDS, 5.2.7 - 5.2.8 :3""

This reverts commit 8c255526d7ee5602f2fabd8ed215b447d0718a8b.