V2.7.0.4 - Cross patch of Essential issue 409.