Copied formatting updates form master branch.