Merge "Adjust to new dcae-app-simulator api"