Merge branches 'version2' and 'temp' into version2
add LE Latch to tracking in Approach State