[ORB-27] initial work on bringing the scanning module into line with the latest core changes in 1.6