BP-778 refactor property for better performance on the frontend
10 files changed