Core/SAI: Additions to d0bde02b21241773c908c18ad

Signed-off-by: Nay <dnpd.dd@gmail.com>