Merge branch 'fix-2251' into grampus-notebook