SOM integration complete
Merge branch 'slohia' of https://github.com/slohia/ADS into slohia