Support for future order blocking
Version bump
Merge branch 'release/1.15' into develop