Merge "Address format check issues" into main