Merge "4.0.3 >>> 4.0.4 yet again, thanks to JBQ, hopefully this is the last time for 9.0" into ics