merge changes from morphemic-rc1.5

2 jobs for DLMS-deletion in 2 minutes and 27 seconds (queued for 8 seconds)
latest