GPII-119: merged latest master, resolved conflicts.