Updatin branch from US413
ReplacingMaster code