merge of branch v0.6-idclean 7180