merge development branch

Line is too long. [87/80]