Revert "Revert "Merge pull request #265 from atlasapi/mbst-5414-pa-repeat-flag""

This reverts commit ae80cb42fc15b627b0221c4ba33d0edd59977664.