added 0.40 feature flag
updated buildfiles