Finished REQ12626.
Finished REQ12627.
Finished REQ12624.
Merge REQ12627 AND REQ12624.
Finished REQ12618.
Finished REQ12623.
Merge REQ12623.
Solve the conflict.