[CHANGE] warn if doing nothing on add/remove
Merge branch 'develop'