[*] Memory invalid usage fixes
assigned to @naeper
master
develop
changed target branch from master to develop
mentioned in commit 29a4171b
merged
mentioned in commit 775a5025