Merge "Added error check while parsing scaling_list"