Latest fixes for user subjects
Latest merge