[PLAT-6125] Updated to work on bean master