Merge "Fix the order for boot scripts scanning"