Merge changes from Jackey;