Merge pull request #515 from jtopjian/jtopjian-multi-ephemeral

[rfr] multi ephemeral support