Merge branch 'as/merge-attr-sleep'