Resolve merge conflict from @JelloRanger's changes