Merge branch 'sg/t7501-thinkofix'