adding other endpoints changes
adding resolve & match endpoints changes
Merge branch 'release/1.3.6.1' into develop