[1.5] Import patch from bug tracker