Merge "Implement extra logic for disabling add call" into nyc-mr1-dev