Backport gh-12590 to 1.5.x and also pick up a few classes that were missed. This commit also makes a few properties bound classes public. Closes gh-17337
Backport gh-12590 to 1.5.x and also pick up a few classes that were missed. This commit also makes a few properties bound classes public. Closes gh-17337