Looks like you've separately pulled in @caesar2164 change, so this will conflict with #2417.  I'll remark on that issue.