Tracked by #744