I think it's kind out of scope this commit in this PR, but if you have your reasons to reduce workload...