Merge "Docs rappmanager developer-guide fix"