[PATCH] v0.6-pre1 draft comments responses