Merge "Some refactoring and added support for another form of vbr headers."