Post YP 4.0/kirkstone upgrade updates