Feature cherry pick

This is work done from a rebase.