Implementing fixes from v1.2.0 into v2 branch


<!---
@huboard:{"order":20.0}
-->