Merge branch feature-get-record into feature-partial-getlen