pull fixes to branch v13

merge fixes from master to v13 branch