BZ-12706 Update header and copy