Merge "Replace CONST.* by getattribute/setattr for refstack"