Merge commit 'sf-ocera-lincan/master'