release/21.1.26

Marija Vranjes Milosavljevic

@marijam

beade270 · Merge branch 'revert-ed1191a6' into '21.1' · Mar 23, 2018

Tagging 21.1.26, to be installed at P1