Merge "Improve getTimestamp documentation" into mnc-dev