Fixing dependencies for listeners
Merge commit '26dd33a0017f4886a818e7b1008233c7bc3ee260'