LOW : merge ongoing 1.7