OFC-1304 - Merge RDB logic with master branch