merge development branch

Line is too long. [96/80]