WMS - Bug Fix
Merge branch 'localdev' into develop