Merge commit 'origin/ser_core_cvs'