Merge "Fixes in ChameleonResponseBuiler"