[merge] merge master to color preparation branch