Tracked by #746