add my own items from my custom branch

these are the items mentioned in #9633
Can't remember, I had this for a long time but never proposed to add it upstream until a few days ago.