Revert "Reverted 'Merge pull request #539 from hmrc/AMLS-3374'"
Revert "Reverted 'Merge pull request #539 from hmrc/AMLS-3374'"

This reverts commit e8964dc888f5d522028b9d8f8248ebecc57a7bcf.

hmrc/amls-frontend,hmrc/amls-frontend,hmrc/amls-frontend