Minor/adapt 2291 forked

Just to see the difference - probably not going to be merged but may implement them in another way