Merge "Gaea updates for 1.9.1 release (#1586)" from release/1.9.0 to develop

Merge "Gaea updates for 1.9.1 release (#1586)" from release/1.9.0 to develop #977