Merge "improved CallStack a bit" into jb-mr2-dev