DCT-25 DCT-28 #resolve Resolve two issues with one commit!