Collection of 1.1.X updates
Extra contributor: H.Shalitha Vikum <HSVIKUM@sinhalaya.com>
Signed-off-by: Christophe Mutricy <xtophe@chewa.net>