Merge "Draft the enhancement of capacity_check API"