merge development branch

Line is too long. [98/80]