Issue 3155 update