Merge "Fix issue in proc state ranking in a cycle"