Code Review PR

Ditto above hotlinking comment.