Bug 864178 v1.4 uplift +shepherd