@thuchacz Getting a conflict on this pull request. Could you investigate? I will too.
@tcatapano Resolved. Go ahead and merge.