Added doc for remaining time and removed onWaitEnd doc
Merge branch 'stable'