Reapply changes from reverted PR 3515 #15657

Job	Run time
cargo-test-sbf (token/program)	7m 16s
check	2m 23s
cargo-test-sbf (instruction-padding/program, token/program-2022, token/program-2022-test)	12m 9s
cargo-test-sbf (associated-token-account/program, associated-token-account/program-test)	8m 2s
test (token/cli, token/program, token/program-2022, associated-token-account/program, instruction...	17m 16s
cargo-test-sbf (token-upgrade/program)	9m 22s
test (single-pool/cli, single-pool/program)	16m 50s
cargo-test-sbf (feature-proposal/program)	6m 45s
test (token-upgrade/cli, token-upgrade/program)	13m 34s
cargo-test-sbf (governance/addin-mock/program, governance/program)	9m 32s
cargo-test-sbf (name-service/program)	8m 12s
cargo-test-sbf (stake-pool/program)	9m 39s
cargo-test-sbf (single-pool/program)	8m 23s
	2h 9m 23s

Provide feedback