3253 reconciled with develop