It is L3 patch, not fix for documentation or refactoring. I can improve it when porting to master.