BRANCH 4.3: fixed inline edit