Merge branch 'PMO-2437' (added missing files)