AB - Added auto ringing support
AB - Merged