Merge branch 'feature/css-service' into merged