WS245 merge to production