Added option not to take time from PNT
Merge branch 'master' into 3.1