Kyle Goderwis - GKOP-864

Welkin #2