Merge "Fix bug with verification of constructors"