Merge "Extend previously added limits for listeners"