Gps refactor #1068

Job	Run time
check-trigger	2s
unit-test / Build infix x86_64	2m 26s
build-aarch64 / Build infix aarch64	19m 38s
build-x86_64 / Build infix x86_64	21m 46s
build-arm / Build infix arm	17m 59s
test-run-x86_64 / Regression Test infix x86_64	57m 26s
test-publish-x86_64	0s
	1h 59m 17s

Provide feedback