shared' for
Closes PR 11588 Closes PR 11591 original commit: 655f6045a286f405f3635357795e68a47c57d21d