LQE-129: repaired method
LQE-129: repaired method
Merge remote-tracking branch 'origin/development' into development