Layout cleanup
Fixed handling version check on non existent versions
Merge branch '2.9'