Bug 841823 for stabization