Safety check: if Apache releases version without a decimal
Remove code without unittests from master (code remains in separate testing branch)
Merged with master