Feature #7272 ready to be tested

You should add "Imanol Losada" here :-)