Bug Fix: PDK-3358