Same commit as Lorena. Created a clean merge.