Merge patches #160, #161, #162 and #163 into patch-164 branch