Added inbox-level max ring time
Merge branch 'dev'