Merge "Fix Typo and URL in readthedocs" into amsterdam