Issue 185_v2: changes for rebase