Copy of Atlassian project with some enchancenments