(issue #3895) pre-process by tenant