Tracked by #748