merge development branch

Keep a blank line before and after `private`.