DELTASPIKE-743 part 2: address some objections from commit 5745b0a6431d57647632356edbaafdc583006251