Merge v1.1.3 - updates into beta