LQE-65: Removed pages to folder
LQE-65: Changed pass to file
Merge remote-tracking branch 'origin/development' into development