[2.4] Updates from other projects, changed package naming, uses maven