Resolve #3579083 "To monolith"

Adam G-Hrequested to merge
issue/local-3579083:3579083-to-monolith into 1.x

Closes #3579083

Merge request reports