initial commit of v1.9-5
Merge branch 'upgrade' into dev