PLAT-3446 - replcaeInput method specifies old value as well as replacement value so that it can be removed from the set of inputs.
Merge remote-tracking branch 'origin/develop' into develop