Applying changes from commit 3b278898d10e9a15a16414b098c3d59f689658ef

Applying changes from commit c5a6513900bf608decbcc4ff14bacf0f182a8b09