merge latest updates into dev #7

Closed nagyrobi closed 3 years ago