Merge development has gone well, good pr…

Merge development has gone well, so far, good progress for five days.

#merge