Temp error avoidance

Keywords has a slight rewrite
Merge branch 'refs/heads/3.0/develop' into AIWS/production