#1 - Alignments to latest WPDK version