Increase timeout for slower reloads
Remove too strict requirement of isBaseAttributeValid

The check upon saving base attributes is enough.