Re: Please rework next commit 23b810171806939a23c3d5df7758b90dda357116 !!!