Merge "bug fix: TC-115 (same cause TC-89)" into tizen