refactor: use substring
instead of substr
#2411
Merged
substring
instead of substr
#2411