Feature #7272 ready to be tested

Here as well