Merge "Enable parallel updates for JJB"