second cycle
merging 'feature/SS-07' into develop