do not merge: cherrypicked 1de41c66e767c009663496c899c62caf0e6c5ad7 and 63ccd6a02c219452ea6a16d899e56b4bf500f044 from master branch
2 files changed