PR: https://github.com/onflow/flips/pull/352
PR: #352