Merge change from multi
Minor formatting change