Backport latest master fixes. Update changelog and bump ver. to 6.7.05