Merge "Addition of Active-Standby Feature"