FB-13284: Improved responsibility and a lot of minor changes.