Merge "Allow overlap in UidMarkMap" into klp-dev