merged in fontalignzones branch