Merge branch 'sg/t0020-conversion-fix'