MAVEN-63
MAVEN-62
MAVEN-62 Sort
MAVEN-58
MAVEN-58 Trailing space