exception for non-db use
Merge commit '3d82e0c247a7b66939a649d0b590354f89287996'