(cherry picked from commit aa62a893) (cherry picked from commit d66226bc and commit 5e2f14e6) Conflicts: src/core/manager.c (cherry picked from commit 7bd1311e)