Initial additions / changes for 4.0.5