[#APOLLO-2110] Change property scope from private to protected & re-ordered annotations