merged in d6a156107df99ceae6b3c85447764712a8fe0684