Merge changes from topic 'portalsdk2.4'