Merge pull request #938 from EESN-W/orion_o6_new #2004

Job	Run time
build	6m 25s
test-optional (check-external-links, manual)	2m 2s
test-optional (gitown, manual)	2m 22s
test (push)	2m 26s
test (commit)	1m 4s
deploy	1m 20s
	15m 39s

Provide feedback