Merge "Fix warnings in porting-guide.rst" into integration