HOTFIX: Enhance check for ddb-common plugin