(cherry picked from commit 3e5d3d099fed5feb6a6807196bea5fed72973fe9) # Conflicts: # CHANGELOG.md
:core
:core:common