Merge branch 'rmobile/core' into rmobile/marzen