getter/putter checks revisited
Merge remote-tracking branch 'origin/feature/runtimeDefaults' into feature/runtimeDefaults