Port changes: * Add dependencies * Correct the patch tag in post-patch * Add patch PR: 231162 Submitted by: swills