- squashed commits from omni for a5.0