Merge branch 'Juan-Antonio' into Idar