Merged with @toretto460