Merge branch 'tmpreg' into devel