Merge "Make Advanceable a public API." into jb-dev