V0.15 rc to master

Changes incorporated in v0.15rc are common fixes that need to be incorporated in master.