Addressed by #3778