Merge "(refs #7316) Improved error locations for invalid field access"