Squashed 'cgilite/' changes from 13c2995..c207699