Merge "Declare visibility on all properties in ForkController"