Bug 3075

Please review these changes