Merge branch 'fixes-togreg' into togreg