1.6 IC 2 Item backport
- See 61e5c849782c9b427132840a5f684c7a205e4d61