Release/1.2: Backported some documentation changes