Merge "Rules update for wbc_service"