[ORB-27] core changes to facilitate the new scanning module