Merge "changing the user guide draft version." into stable/danube