modifications api
Merge branch 'dev-com'