@andrerom since this is a customer issue I guess this change should be deferred in any case.
Are you ok with the setting being moved up to the Repository?