merge workaround res to main res part 1
merge workaround source to main app