JSpace improvements merge.