merge development branch

Line is too long. [102/80]