Integrate a csm tag bug fix from dev to release 0.8.6