Completed feature/SS-05
merging 'feature/SS-05' into develop