resources: Merge develop branch into stable branch

Change-Id: Ieca2901a6a4f846b3626276076bec402d05e6165