Impementing Lang Menu fix - CONTRIB-4501