Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-enterprise-base into developer
