Created by: akzhan
This is already fixed in master but still errored in 6-7-stable branch.
6-7-stable