Merge in of specification from master branch