Adding updating conditions see BT#6369