Addressed multiple requests from the Developer Community.

With this update, we addressed multiple requests from the Developer Community.