Merge branch 'develop' into feature/bash-logging-filter/BK-2020-02