Merge "Fix build >= JB"