Merge "Modify to accommodate changes in StandardAppHelper" into main