Backport of 1.6.2 IC2 Update
-See edf458dbfc16da9f30fce116f0e42b810391f541 for changlog