Merge "Update to how evs_app resources get included"