Sync with ScriptDev2 2986

Signed-off-by: Salja <salja8840@gmail.com>