FLIP PR: https://github.com/onflow/flips/pull/369
FLIP PR: #369