CDB-1811 Improved user feedback and reactivated specs for WMS
Merge CDB-1811 into release/2.10.1