#2038965 - Support out of page slots
Merged with latest commit