merge development branch

Line is too long. [100/80]