Emergency update restore #2

Merged
merged 3 commits into from Dec 5, 2017