Merge "BUG-509: add missing copyright headers"