[s1958] Maintain compatibility with master

(based on commit [12441] - e91ad73)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>