Merge branch 'release-2.4.2' into 'develop'

Merge branch 'mazq-subobj-1025' into 'release-2.4.2'

See merge request dcuc-tjdsj/auth-back!118