Intelligent point selection functionality  - https://catami.atlassian.net/browse/CAT-777