Conflicts:
	framework/CHANGELOG.md

Conflicts:
	framework/CHANGELOG.md

ActiveQuery::one() slight refactoring

This reverts commit a5846fa2, reversing
changes made to 2a6e064a.

Check if property is set

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.