Revert "Revert "Ajay/Melanie | #3101 | Updated logic for defaulters""

This reverts commit 28b51046d1ae4ccad877bc8ae33a92c97aafeb04.