Merge "Don't send configuration that app doesn't support to it." into oc-dev