combined sprites and maps MR for test server - the separate MRs have a conflict, to be solved during the merge process.