Merge branch 'feature/sql-thread-sat' into 'develop'