Feature/cfy 487 plugin return value