Merge "BUG-4236: resolve TODOs - part 1"