*Fixed DO-3798
Merge branch 'release-6.1' of https://github.com/Gooru/Gooru-Core-API into release-6.1