picked up some commits from master to 3.0 branch
fixed ref name