Merge version 1.6.0