rst: updating with latest from longrunning topic branch