[SR-Dev] git:master: Merge commit 'origin/ser_core_cvs'