add toggle whether to apply null-safe-collection interceptor
package rename uppercase to lowercase: Impl => impl