Merge "Accumulative patch from commit 1075b2957169d8f9d6dddd7679339c751dc9515b"