Kingfisher

8995a41d - Merge pull request #2355 from onevcat/issue-2352-regression-scene