WS246 -> master -> production (preliminary)