Merge branch 'feature/location-logging/EVA-2020-02' into develop