Merge various changes from local project 'AQFMapping'.