merge master commit cb11232