Merge "Revert "Introduce initial CTS test for APF functionality"" into main