Merge "BUG-1258: Mark FIXME for implementation"