added open issues
(cherry picked from commit 663f4a5)
changed method order
(cherry picked from commit b053021)