merge in master-release history after reset to 518eced8dc5ad631092d0bfce3e013e2fd098863