TEST-34 #time 1m Feature7 작성완료
Merge branch 'feature/feature7' into develop