[Bug 885680] - Adding subject management

(cherry pick from ee3fe8c84cd5edfc2061510409039b7858620051)