Merge "Fix indentation error in docs" into feature/zuulv3