Fixed another build error and addressed items for which I needed content in the latest develop branch.

[#53229635]