Tracked by #743