Initial LOS refactoring...
Merging recent commits
Merging recent changes
Merge remote-tracking branch 'origin/develop' into develop