Merge branch 'fix/regex-constraint-syntax'
Merge branch 'fix/unknown-appstate' into develop