code
resolved merge conflcits
code
Merge branch 'master' into rimal-hybrid