Initial merge to Altis, disabled parameters