Merge "Appc Conf Changes"