@xnoinspection -> @noinspection
Avoid logical operators
Merge branch '1.0'