Merge branch 'es/want-color-fd-defensive'