Merge "Revert "Add boolean method for knowing the buildVariableFamily r..."" into main