Release_1.0.5.1 Merge

Merge 1.0.5.1 changes from vbawol:master