t428 - Accounting for value not existing on a new node
Merge remote branch 'origin/7.x-4.x' into 7.x-4.x