[Malima] Update nov 11 (reverse-merged from commit 8b916a705ebbd515cbf7aeaf88e57eb1a0087169)