Merge "Remove proxyunbannable from core"