Merge "Allow manual to be read from disk" into mnc-dr-dev