Merge branch 'bdale'