Introduce shell build step
Fix annotations