Merge "Add instantiation state check"