Merge "Add a check to ensure that intent data is available before proceeding." into main