* commit '2f04883ff880966d63d1aa4a1c7b05e497cfcc58': SDK only: integrate new sample code, deprecating along the way.