Merge "Fix code and test related to rules version check"