Merge "Disable addHelpLink when including special pages"