Merge commit 'origin/silc.1.1.branch'