Merge pull request #1226 from shackbarth/22500-prefix