Merge "Move the check on multisim support when switch configuration is done"