Merge "Fix to show correct duration." into klp-dev