Merge branches 'bug972936', 'bug975210', 'bug974745' and 'bug980014' into tiles-central