Merge "[COMMON] Fix resources indent"