Merge "release/3.5.7" to "develop" branch Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>