Merge branch 'wakeup-etc-rafael' into release