Bug 16493 merged