IDS should not be inherited
Merge branch 'dev' into ms