Ugly hack to make rcheckin merge commit working...