master -> dev

Rangsiman Ketkaewrequested to merge
master into dev

Keep dev updated with master

Merge request reports