APF-1358: Re-added files accidentally deleted.