Merge changes from adding rxUnique