Merged branch 'shouldHandle'.