[MERGE] merged changes from 6.0