Merge "Fix cds-blueprint-processor and dependent"