Merge with 1.4.6 and modify composite test