spec refactor
Merge branch 'feature/t578' into develop