Merge branch 'latona-3.0' into latona-3.0.y