Merge branch 'almaleksia/consolidate-issues' of https://github.com/gi…

Merge branch 'almaleksia/consolidate-issues' of https://github.com/gi… #3064