LQE-267: refactor
LQE-267: refactor
Merge remote-tracking branch 'origin/development' into development
LQE-267: refactor