Merge branch 'minas' into abecker/charj-main