Merge "Fix broken variable inclusions in API unblock parameter documentation"