Merge branch 'hotfix/3.5.3'
Merge branch 'develop' of https://github.com/RufusMbugua/essential