Merge branch 'mikhail.golubev/configurable-issues-states'