Merge "Remove controller blueprint chart"