Synch with SVN after fixes for CType list and "not assigned" layout columns