PR #1566 - mnfst/manifest