merge development branch

Prefer using a single-line block whenever possible.