Merge branch 'latona-3.0' into HEAD