Merge commit '61f1cbdd71942433ce1515b614ec3d9c259ea037' * commit '61f1cbdd71942433ce1515b614ec3d9c259ea037': Adding a feature definition corresponding to support for Near-Field