#1052 Cleaned up familyshield branch