Merge "Check whether feature is enabled by compare with apex version" into mainline-prod