commit from cnpallares-branch