fixes for temporal sets
Merge remote-tracking branch 'origin/master'