merge Settings into orca4.4
merge Settings into orca4.4