Merged in changes for RRP's firmware 0.87