Merge branch 'topic/get-cpu-var' into next