BUG#38018 See merge request !964
Bug 32146 See merge request !963
Aia bug 26464 See merge request !962