Merge "Add vertical uncertainity field"