Issue 3153 update