Merge branch 'develop_dl_plan6_temp_merge_colony' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6_temp_merge_colony