Merge "[Portal] Followed Logging Compliance Specification Guidelines"