Feanil/common cluster updates

@e0d please review.