merge development branch

Line is too long. [85/80]