Sync with upstream

Add support for {this} in step names