Merge "Update app helper to messaging" into main