Merge branch 'congr' into convert