Merge "Fixing issue in current and max duration calculations." into nyc-mr2-dev