Changes since tag v9.0.1.406

commit 87014a6454e15b300f934146a6167e5e5fde79e3
Author: Tercio Jose <terciob19@hotmail.com>
Date:   Sat Nov 21 16:18:05 2020 -0300

    Merged some changes from beta

