serrano: Initial changes for 4.3
Merge pull request #308 from arco/cm-10.2

serrano: Initial changes for 4.3