Merge branch 'at_data_member_location'