Created by: vchuravy
Still need to decide if we should use Requires instead of hard includ for pre-1.9