Merge "Bug 442685 - Fixed NullPointerException in ECL Context"