Backport #500 to v1.16 #390

Job	Run time
check	7m 35s
test (token/cli, token/program, token/program-2022, associated-token-account/program)	29m 7s
cargo-test-sbf (token/program)	16m 44s
test (single-pool/cli, single-pool/program)	19m 10s
cargo-test-sbf (instruction-padding/program, token/program-2022, token/program-2022-test)	26m 26s
test (token-upgrade/cli, token-upgrade/program)	17m 32s
cargo-test-sbf (associated-token-account/program, associated-token-account/program-test)	17m 45s
cargo-test-sbf (token-upgrade/program)	16m 42s
cargo-test-sbf (feature-proposal/program)	16m 44s
cargo-test-sbf (governance/addin-mock/program, governance/program)	24m 50s
cargo-test-sbf (memo/program)	16m 37s
cargo-test-sbf (name-service/program)	16m 40s
cargo-test-sbf (stake-pool/program)	22m 48s
cargo-test-sbf (single-pool/program)	17m 57s
	4h 26m 37s

Provide feedback