@DavideD: That's needed for Final? Or is the current behavior fine and we can consider to make it configurable down the road?