I think this PR is good to be merged, should this line be merged as well?