Merge from upstream.

Remove the white margin. (YAML shall be used)