SA changes (pertaining to kai only)
Authored by: vsp_nagel 2014-02-26
Parent: [r28116]
Child: [r28118]