Refactor rock4 series #1919

Job	Run time
test (commit)	1m 55s
test (push)	1m 43s
test-optional (check-external-links, manual)	1m 12s
test-optional (gitown, manual)	1m 43s
build	0s
deploy	0s
	6m 33s

Provide feedback