WPDS Dusseldorf changes

Signed-off-by: Andre Jay Meissner <ajm@adobe.com>