Merge "Tighten up the KG transport control layout for stability" into klp-dev