Merge "We need to go deeper. Bug #3431907"