Merge "Fix bug with verification of constructors"
am: ffa2c7c312

* commit 'ffa2c7c312d1c6dcbade9d7332e929fcaca5f559':
  Fix bug with verification of constructors