Merge branch 'refresh_allwhite' into refresh_master