add my own items from my custom branch

these are the items mentioned in #9633
In that case the FANCY isn't gonna get merged.  Sorry.