dlx: updates from M7 GE 4.3 and Butterfly 4.2.2