Added 16-bit address sample event call
merge with sample address change