add post-DEV_6 SQL from PR #1645