Fix #1072#1085

Merged

cspotcode merged 3 commits intomasterfrom

Aug 4, 2020

Commits on Jul 29, 2020

Fix #1072
cspotcode
committed
add tests
cspotcode
committed

Commits on Aug 4, 2020

merge latest master
cspotcode
committed