MYLOC-83 - Feedback from PR