Merge "InlineEdit: Adapt SBS2 to recently made code changes"