Merge branch 'pr/5' into design

before merge to MAPC develop