Hot fixes from master to develop