Merge "Rename autoEnterAllowed to autoEnterEnabled"