Merge "Fixing more RTD warnings"