merge development branch

Line is too long. [83/80]