Code changes ask by the review.
Merge branch '1273-dc-testing-account-take-2' of git.chevah.com:compat into 1273-dc-testing-account-take-2