Merge "otasp refactor"