Development to master merge.

Use resource. Lint can help in it as well.