Merged block part with the one existing in @Dorimanx LG-STOCK-KK branch.