Needed to merge thoses two branches as I needed to to uses features from each other to implement GF180MCU.