Merge "SF: add boundary check for active config"