[Jackie] merge to master from Jackie