merge development branch

Line is too long. [99/80]