Backport conditional expressions support to 1.7.0