LQE 88: Change logic of methods
LQE 88: Change logic of methods
Merge remote-tracking branch 'origin/development' into development