Merge branch 'bug/JAL-3296changeStartInvalidateCursor' into develop