Built rileyjshaw from commit c057837 on branch dev