Merge "Fixed package binding issue"