Merge branch 'local' into trunk. Fixes TAP5-1433, TAP5-1434, TAP5-1435, TAP5-1436, TAP5-1437, TAP5-1438, TAP5-1439