Master Ready

Master-ready changes. Please merge and do release to master.