Merge "Fix valid subId check" into main