Merge branch 'chad3814-develop' into develop

Thanks, chad3814.