Merge "Fix CodeSniffer errors and warnings"