[PLAT-4572] Add ConventionSource support
[PLAT-4563] Fix unit test