Merge branch 'ras/urgent' into ras/core