Merge "Addressed compile-time error related to non-existent struct member." into...