Merge pull request #339 from thnkslprpt/fix-338-move-eid-to-end-of-ev… #414

Job	Run time
Build and run with startup msg verification / checks-for-duplicates	4s
Build and run with startup msg verification / Build and run app, confirm startup message	59s
	1m 3s

Provide feedback