Merge branch 'ras/urgent' into ras/core

Pick up urgent fixes to apply further development changes.