EPD-165 & EPD-161: Support for settings restart and WMS layer handling