Updating branch develop with release/3.4.8 Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>