adds ExternalTimeWindow
adds test
Merge branch 'ExternalTimeWindow' into dev