Merge the new patch which unit test ok for Johnny side