Declared missing dependency on parent (RT#86183)
Merge remote-tracking branch 'upstream/master' to keep in sync