Updated to match recent version of parent repository