Merge "Fix copy / move behaviour of Maps object."