Merge "Filter hook entry points by ICD entry point presence" into main