Changes on the StartsWith, EndsWith operators based on develop branch