Ref #4601: add comments and header