Pull unaligned-snsc_event into release branch