Merge "Change CustomActorImpl destructor to protected" into devel/master