#3573214: Changes with test coverage

Marcin Grabiasrequested to merge
issue/lms-3573214:3573214-with-tests into 1.1.x

Closes #3573214

Merge request reports