Closes #1386 Vanilla commits applied: f99a3deced 731b957e8e Removed two unused files and a few variables made redundant by actionInProgress
f99a3deced
731b957e8e