OPAL-2021 - preliminary commit for database delete completion