Add changes for Chameleon OS 4.3