cherrypicked a01940fac58d397b384b709631921810d95606cd Merge pull request #639 from ahgittin/fix/addChild-with-spec-on-interface onto 0.5
Merge pull request #686 from andreaturli/0.5

cherrypicked a01940fac58d397b384b709631921810d95606cd