Merge "Fix pipeline hash" into devel/master