Sync logic with ruby-builder

Sync logic with ruby-builder

Sync logic with ruby-builder