LQE-13, LQE-16 test
Merge remote-tracking branch 'origin/development' into development