Merge "ScanDetailCache cleanup" into oc-mr1-dev