TIDOC-1138 Tooling updates for 360