Merge "Move master of masters address param"