Merge from RC
19 Apr 06 kostja 4358
template refactoring
07 Apr 06 Alex 4216
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.