Merged in RRP's firmware 0.82