Merge branch 'ras/urgent' into ras/core

Pick up urgent fix as pending patch depends on it.