LPS-49513 Although it's not necessary we better modify all the other places for consistency and to avoid possible bugs in the future