Merge remote-tracking branch 'devel/vcs_celine_isof_bug'
Merge remote-tracking branch 'devel/cdutil_cleanup'