Merge branch 'stericsson/cleanup' into next/timer