Merge "remove logic for comparing clipped state." into devel/master