PR #1387 - mnfst/manifest