Merge branch 'bug-y'