Additional changes for 2d4f18092d44c965d80df02beb71135c2721582b