Merge branch 'ramosam' into juksa_local