[GIT PULL] malidp-next-fixes