Merge "BUG-1511: add FIXME markers"