Imported latest scraps which fixed hidden nested sticky issue