Recommit r232027 with PR22883 fixed: Add infrastructure for support of multiple memor...