#40679 comment:refatored