Merge branch 'develop' into 'master'

Merge branch 'master' into 'develop'

See merge request dcuc-tjdsj/approve-gateway!19