Fixed foster parenting actions
auto-merge staging into master