BAC-505: one more changeset