[12590] Some Missing Changes from last commit =)

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