Merge "Extract the otapreopt parameters in their own class and add tests"