[#110614] Changes to add new functionality