Merge "Fix for invalid comparision value" into devel/master