Merge branch 'develop' into feature/time-server/EVA-2020-02