sync-up changes from main stream

sync-up changes from main stream