Merge "[SP37] Change requirement of older event callback." into sc-dev