Merge branch 'fixes' into work.icache