Merge branch 'master' into script_devel to include layered cluster, configure options and cluster bug fixes