Also do not rely on Java class comparison, check against qualified names. (cherry picked from commit 7610945)
(cherry picked from commit 02a3e6b)
(cherry picked from commit 948a4b6)