Updated with coding standards and security review merges.