Built rileyjshaw from commit cc40850 on branch dev