Merge branch 'accept-shift-age-and-shift-size'