Changes to SLM due to circular dependency
Merge branch 'development' into SanchoSLMWork
Refactoring SLM projects - stage 1
Changes to SLM
Major refactoring of the SLM
Small change