Merge commit '4e86f2545683ce4226cbfe00a664214f047747d5' into Teaman-ND (from Teaman...