Merge "Late binding: fix refactor mistake in Cipher"