Merge branch 'feature/participant_page_#6' into staging