@tc We have pending discussion on this. Please do not merge for now
conclusion of this discussion is that this change can be dropped