Merge branch 'powersave' into 4.14.98