Merge "Adding validate before switch feature."