Don't fetch old bean property value if it is not needed (#10940)

Change-Id: I6231eedef94c402457fc4cb217366a3e08f1492c
Merge "Don't fetch old bean property value if it is not needed (#10940)" into 7.0