Merge branch 'sky2'