It will be addressed during the next following Maintenance (the one after the Valkyrie Class is released).