Merge "sync RadioError from IRadio 1.6"