merge development branch

Line is too long. [104/80]