End of this branch: fix to beginning of df-1401.