Thank you for the patch.

There is one minor lint warnings in QA, and maybe it more suitable for databases module (based on description)?

Thanks,

Oleg