[geard/f21] update to master commit e2502a6e33a117b23be05443854ac83b7e45a977