Authored by hf

merge release code to fixes bugs