Merged. Some changes that should already have been incuded during previous merge (mostly about PlcStatus) have been included this time.