Merge issues
Revert "Merge issues"

This reverts commit 83b7252a78cedc8dcecb48073ed6fc9cd5062445.
Merge remote-tracking branch 'origin/master'