Merge 1.5.1 pre release code to master for a full release