Merge branch 'fixes-wakeupgen' into fixes