Merge "Code cleanup inside findnearmv code." into experimental