Merge branches 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest