Merge "Doc CBA content change"