Merge branches 'rmobile/ag5' and 'rmobile/fsi-despair' into rmobile-latest