Merge branch 'resolve-if-completed-before-circularity' into 'master'
Define interaction between use_last_activity_as_completion_time and… See merge request !53
Define interaction between use_last_activity_as_completion_time and… See merge request !53