Merge branch 'feature628'