Add missing return to method.
Merge topic 'compatible-INTERFACE-user-properties' into next

b8a756e Add missing return to method.