fix issue with frame of reference conversion invalid unitKey and some refactoring;

2 jobs for !26 with fix-unit-conversion in 5 minutes and 31 seconds (queued for 2 seconds)
merge request