Merge branch 'bl/shade'