V.next

Current changes do not require next API version.  Merge fixes broken samples in master branch.