Fix some compatibility with gitlab 4.1 && merge with caution