[CB-4952] check against /private/var as well
Merge remote-tracking branch 'niltz/dev'