Merge "Support of DB-enabled features"