Updating feature branch with last changes in develop Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>