Issue 3150 Update