Merge branch 'master' into 'develop'

Merge branch 'release/v2.3.0' into 'master'

See merge request dcuc-tjdsj/auth-web!17