Merged fix_PLC_runtime_shutdown

2019-04-18, Edouard Tisserant