New behaviour in getters/setters. Updated JavaDocs.

Change-Id: I214f581b0845b484d57f8d5735e8c50b68d6e477